debian/libgtk-4-doc.*: Adapt install files and links to gi-docgen paths

Docs are installed all in /usr/share/docs/libgtk-4-doc subfolders and
linked to /usr/share/gtk-doc to keep devhelp support

diff --git a/debian/libgtk-4-doc.doc-base.gdk-wayland.in b/debian/libgtk-4-doc.doc-base.gdk-wayland.in
new file mode 100644 (file)
index 0000000..6d2090a
--- /dev/null
+++ b/debian/libgtk-4-doc.doc-base.gdk-wayland.in
@@ -0,0 +1,13 @@
+Document: gdk4-wayland
+Title: GdkWayland Reference Manual
+Author: Damon Chaplin et al.
+Abstract: The GDK library provides an OS-independant wrapper around the
+ most fundamental graphical user interface functions.  This allows
+ GTK to be ported to non-X11 systems, as long as GDK is ported first.
+ .
+ This document covers programming in GDK with the wayland backend.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/@DOC_PKG@/gdk4-wayland/index.html
+Files: /usr/share/doc/@DOC_PKG@/gdk4-wayland/*.html

diff --git a/debian/libgtk-4-doc.doc-base.gdk-x11.in b/debian/libgtk-4-doc.doc-base.gdk-x11.in
new file mode 100644 (file)
index 0000000..28fcc06
--- /dev/null
+++ b/debian/libgtk-4-doc.doc-base.gdk-x11.in
@@ -0,0 +1,13 @@
+Document: gdk4-x11
+Title: GdkX11 Reference Manual
+Author: Damon Chaplin et al.
+Abstract: The GDK library provides an OS-independant wrapper around the
+ most fundamental graphical user interface functions.  This allows
+ GTK to be ported to non-X11 systems, as long as GDK is ported first.
+ .
+ This document covers programming in GDK with the X11 backend.
+Section: Programming/C
+
+Format: HTML
+Index: /usr/share/doc/@DOC_PKG@/gdk4-x11/index.html
+Files: /usr/share/doc/@DOC_PKG@/gdk4-x11/*.html

diff --git a/debian/libgtk-4-doc.install.in b/debian/libgtk-4-doc.install.in
index 26c100daad7d290ad24ffbe46a415bc05c8c1b32..1859211574f5a3c2d992d3375b2a392e207f6def 100644 (file)
--- a/debian/libgtk-4-doc.install.in
+++ b/debian/libgtk-4-doc.install.in
@@ -1,3 +1,5 @@
-usr/share/doc/gtk4*
-usr/share/doc/gdk4*
-usr/share/doc/gsk4*
+usr/share/doc/gdk4 usr/share/doc/@DOC_PKG@
+usr/share/doc/gdk4-wayland usr/share/doc/@DOC_PKG@
+usr/share/doc/gdk4-x11 usr/share/doc/@DOC_PKG@
+usr/share/doc/gsk4 usr/share/doc/@DOC_PKG@
+usr/share/doc/gtk4 usr/share/doc/@DOC_PKG@

diff --git a/debian/libgtk-4-doc.links.in b/debian/libgtk-4-doc.links.in
index aac5175be7cef3b20a302fb988b252e3ada70600..5621c97beeb55a28816838e888c3573ff5f74e7a 100644 (file)
--- a/debian/libgtk-4-doc.links.in
+++ b/debian/libgtk-4-doc.links.in
@@ -1,9 +1,13 @@
-usr/share/gtk-doc/html/gdk4 usr/share/doc/@DEV_PKG@/gdk4
-usr/share/gtk-doc/html/gdk4 usr/share/doc/@DOC_PKG@/gdk4
-usr/share/gtk-doc/html/gsk4 usr/share/doc/@DEV_PKG@/gsk4
-usr/share/gtk-doc/html/gsk4 usr/share/doc/@DOC_PKG@/gsk4
-usr/share/gtk-doc/html/gtk4 usr/share/doc/@DEV_PKG@/gtk4
-usr/share/gtk-doc/html/gtk4 usr/share/doc/@DOC_PKG@/gtk4
+usr/share/doc/@DOC_PKG@/gdk4 usr/share/doc/@DEV_PKG@/gdk4
+usr/share/doc/@DOC_PKG@/gdk4 usr/share/gtk-doc/html/gdk4
+usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/doc/@DEV_PKG@/gdk4-wayland
+usr/share/doc/@DOC_PKG@/gdk4-wayland usr/share/gtk-doc/html/gdk4-wayland
+usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/doc/@DEV_PKG@/gdk4-x11
+usr/share/doc/@DOC_PKG@/gdk4-x11 usr/share/gtk-doc/html/gdk4-x11
+usr/share/doc/@DOC_PKG@/gsk4 usr/share/doc/@DEV_PKG@/gsk4
+usr/share/doc/@DOC_PKG@/gsk4 usr/share/gtk-doc/html/gsk4
+usr/share/doc/@DOC_PKG@/gtk4 usr/share/doc/@DEV_PKG@/gtk4
+usr/share/doc/@DOC_PKG@/gtk4 usr/share/gtk-doc/html/gtk4
 usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DEV_PKG@/glib
 usr/share/doc/libglib2.0-doc/glib usr/share/doc/@DOC_PKG@/glib
 usr/share/doc/libglib2.0-doc/gobject usr/share/doc/@DEV_PKG@/gobject

diff --git a/debian/libgtk-4-doc.lintian-overrides b/debian/libgtk-4-doc.lintian-overrides
deleted file mode 100644 (file)
index 29ee2a0..0000000
--- a/debian/libgtk-4-doc.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://bugs.debian.org/970275
-libgtk-4-doc: package-contains-documentation-outside-usr-share-doc usr/share/gtk-doc/html/*

diff --git a/debian/rules b/debian/rules
index a43364f82185d37cdfe89486f141556db03b6598..a6e07311a79e19ac21a2f6ce80d7be25a54b51cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -258,17 +258,6 @@ ifneq ($(filter %-udeb,$(built_binaries)),)
 endif
 
 override_dh_install:
-       rm -frv debian/install/deb/etc/emacs/site-start.d/*gtk-doc-tools.el
-       rm -frv debian/install/deb/usr/bin/gtkdoc*
-       rm -frv debian/install/deb/usr/share/aclocal/gtk-doc.m4
-       rm -frv debian/install/deb/usr/share/cmake/GtkDoc
-       rm -frv debian/install/deb/usr/share/emacs/site-lisp/gtk-doc-tools
-       rm -frv debian/install/deb/usr/share/gtk-doc/data
-       rm -frv debian/install/deb/usr/share/gtk-doc/python
-       rm -frv debian/install/deb/usr/share/man/man1/gtkdoc*
-       rm -frv debian/install/deb/usr/share/pkgconfig/gtk-doc.pc
-       rm -frv debian/install/deb/usr/share/sgml/gtk-doc
-       :
        rm -fv debian/install/udeb/usr/bin/gtk4-update-icon-cache
        rm -frv debian/install/udeb/usr/share/gtk-4.0/valgrind
        rm -frv debian/install/udeb/usr/share/metainfo